removed switch statement in order to stop irritating bugs