Reflect comments from Moshiur