Changes to my impl of forester