Changing output to include markup