Structure Changes and Processor Fix