added contact-reevaluation on world-switch