clearer names for actions, and infer actions better