Hmm.... 3rd times the charm, think I should extract this into a a shared piece of code? :)