case option again
merge thomas