big reorganization for new action/walk system