Updated to basic working state