Tidied up stub a bit