Reva: optimizations

Current