Add more new instruments, take out debugs