Updated to current working state