5/30/2014 10:51am changes NOTE: bugs at map