renamed some methods. Makes more sense