Stuff from Friday

changed stuff