Implemented comments from allanlw