Little changes in APAT1012.cpp