Update of AtrialMachine @Orthank