tried new logic for hours