GUI-467
edits based on review