Update code with comments from Garrett