added Registers,  other components
fixed merge