simulator enhancements and models for new tool logic