updates as per @jaguarul comments (Thanks !)