added more fields, styles