Added r18n
Removed shotgun after merge