tailor generator a bit more