Fixing my screwups..