more modifications and style changes.