Latest version - with added/updated comments