moved the fixed map for cleanliness