map model reworked;