added feautures, parameters reordering