Schoses 2.0
fixing things