Tried to fix somethings