PTQ

Issue 1.2
PTQ Issue 1.2
Issue 1.1
PTQ Issue 1.1