Now works with more versions