completely changing everything just before the presentation,yay
forgot these 2