updated to reflect current situation