added Sim cases, tidying up