changed to 0.2s transistion