Improved designed and prepared for release