Added the ability to limit the map