Switched all other calls to no-args method