pawitp new changes revision 7