Removed duplicates, have to add a switch