some minor tweaks final outputs are open for discussion