Rohan's suggested changes