Changes to adding Staves