Please please shlomi accept my changes , it wonderfull framework