unning - but needs tweaking