* Decoupled some bits, and streamlined/reduced code.