Re-engineer requirements