Added cancel capabilities
Cleanup