fixing methods that were moved