Ronnie: 2nd modification on compose