Changed method params, preparing for OO design