Make changes as per review on 22-4-14