Some experimental changes around
Always make sure we only have one of those