Merge with jen's changes
Adding some more comments