Change to direct register access