way too many modifications for a commit,
I shoud had split the it.... nex time.
commit...