need atdd and remove