working on streamlining logic to be better