More change to staff parsing