Making it composer friendly