Test changed a bit
Hamilton's Changes to Map