fixed some stuff
second try