Moving more logic to machines