Adding working map code