some changes that need fixing