update based on comments from Maria Cruz, Beniot and Jouni