Works with both versions separately