Incorporate Andre's comments and edits