some changes for 5.0