timey-wimey thing is no longer hardcoded