added changes to output and added custom output