Added restructuring idea.. Would be much better, but a bit slower (does
it matter???)