Added more stuff, replies etc