Added more, tried to format as well as possible