more changes for 4.2