Better logic