updated for large machines