Convert to simpler completion