added cannons
merge
changed assets to text