Added more cool stuff