Sort it out

problemos need to be fixed