more changes for 7