Final commit

more details here if you want