Oops- Fix up methods