Still trying to rework the logic