Add new features
Change code 
Several changes