Cc @Boikanyo addition 2 my devices