COSMITS

FIXES: addressing discussion

FIXES