Updates after Mark's feedback (that i had not seen before)