R6 changes