incorporate Alex’s domain stuff feedback