updated to reflect latest situation