Update exec and annotate for better output.