trying to rework logic