merge places code from gwt