Changed targeting regex to allow for no space after @
Commands are local since I removed the second file