Adding context, removing unused params.