first commit from cpqd \<cea85b\>