Added tracking and prepared output