Refactored web process