add YAP
add YAP energy resolution