Fixed dirty echo removed export, shuffled it a bit