STUFF I ADDED