style
merged lorena