added highlight and simplified defaults