Revised version upon received feedback