Optimised map drawing

Created by VS 2013