Refactor hardware to allow second by second control