Addressed Simon's comments