Trying to fix all the problems