Adapted to new parameter names