15, 7 added, style updated