some changes, some fitting
back ot old