Updated to reflect current status