Changed output a bit..
Put stuff where it belongs...