updates as per discussion