Added proposal from speaker 17