make it more composer friendly