Changed to fit the new interface