changes issue #3 - composite