TODO RELEASE/FLUSH for supporing 'cp