New switch image
A workable switch and bug fixing