Once again, development issues b/c of changing some of the method calls and arguments