Drafted 2

Draft 1 after taking into account feedbacks