refs #5106; improves system