Cleaned up and improved mapPost