work on small cannon
merge