removed duplicates in switch statement, added as default only