conservative add sketch and tests and changes to cms for easy impl