here are some changes