Addressed suggested fixes, third time is the charm