improve instrument state changes