A bit of code moving around