Back to a working state
Work in progress note