initial 4.1 changes