Intermediate Commit

In case major changes in future further break the current state.