Improved exiton handling.