Attempting a cut version of support-v4