Some improvement
Foursquare test tmp