Fixing Joels Bobo part 2