Several changes
Adding more stuff