Working on switch return