added feedback EP kick starter
fixed merge conflict