Made it more composer friendly