Added cannonball, removed useless code