Map fixed. Now using ID number