Some logical improvement