Working on the --complete-psl flag