Updated and simplified samples