repaired handover of parameters handling
backup  some changes