Change execution order. Simplified code.