removed source from separate and write tags