Revert "Peter Version"

This reverts commit d8cddaa7461130308d491926505fca2436b14b57.
Revert "simpdanny version before integrated"

This reverts commit ea57e51ef9f88bae76a67a5e79afabf18f7bac27.