Re-engineering to improve behavior