Greg: little template modularisation