merge thomas
case improved