remove tmep file
remove temp file
Update .on method
change few space
Merge branch 'pp' into develop