working on switch again