- Bugfix Tracker + add separation criterion