MAJOR CHNAGE: Some methods renamed.