Added logic + categories