* Forgot this slight rearrangement of methods