Trying to fix the problems I created