partial finalization
Merge branch 'master' of https://github.com/lkb123/cqas
parital finalization part 2