fix input param & remove reference to machines