Updated to reflect current state of things