Modified Processor and tests