Improves officer flow