How to avoid rework