get rid of the old logic