deleted switch - which was BREAKING EVERYTHING - and used if / else