[UPDATE] Fully working map