Dev/davide barbieri/working on issues