Updated; removed redundant messages