Trying to fix my mistakes