Fixing ben's bugs like usual