a bit more refactoring to really distinguish the labs integration