new machine and few changes