I:
Added PQ solving