Updated with new machine settings