Updating yml
Adding more features and removing stuff