After more oo style - thanks @nthx