Updated to reflect current state