half way updated with flabios stuff. next commit will have the rest
forgot to add this file in the last commit
flavio changes finnaly done