Added more fun things