More changes on location of methods.