Removed qual field, added comments