final commit, No maps API