Implemet changes
Implement release
Refactor