Changes as per discussion