Rev 12

updated - injector and message handler