Added shortcuts; now cases can be empty