Updated to current state