much better now, nearly finished