Changes made for new machine setup