Fixing my mistakes!