Added switch to Numbers/Images