merging code for uberrest