merged newest front end from stream-sync