standards/challenge improvements