Tidied up Instrumentation