Update as per discussion