Incorporating Jens' feedback