Updating draft based on Fingon's comments