added intervals and took the decision to doo un + foll machine in the same file