Updated with comments from NS