Updated proposed solution