R76 update + some optimizations