moving more methods around