First pass edit