Added switch functionallity!