short fix
 remover middle activitys for less steps
fixed merge conflict