Adding in new logic, hint from Stephan from Reflektion.