Modified static utility to account for late-add edge case
Completed form