optimizations

Cloud and server