Made final output much more dynamic