Tailor things

Tailor things