restructured to allow for different types of instruments