This should fix all the current changes