Addressing some issues from earlier