Cosmetic changes of source and output