updated proposal wrt initial feedback