Added a check flag and indicator