last fix & ready to merge