reverted last commit as was done in haste, and not particuly helpful
merge