composite plus minor changes