Updated to reflect completed work