- more new logic