some un commited changes from a week ago