additions and style changes