Bit refactored ....