Fixed and updated my second post with better map.