Optimized Cushions

Optimizing cushions on client and server