Reverted last changes due to not showing the map