Work on camera ready version