Updated comments for use as a template