Modify the proposal according to Shaun's comment