Update as per @akarnokd's suggestion