redoing some changes