This is the full solution being committed