Renamed method and reshuffled/renamed some parameters.