changes following Ali's review