Fixing my mistakes :(