more changes for 1.5