updated to reflect current state