Next attempt at correct composition