Added more features that I liked