adapted to new parameter interfaces