changed some shit
working