Fixing me fixing Bobo's stuff