added new lines, some, lazy to summarize