Second try, took some advices and references on how to fix the mistakes from the first try