Update -2, -R and -Y to behave consistently as per the concensus reached on