few enhancements for r1