Modify to work with newest version