messed up, fixed (sort of)