Adding new features
Added features and merged conflicts