Map fixed and working