moved back the action as it needs beta...
cleaned up