Improved to a working state