Better logic in article