added more, reformatted