nearly working better version of previous
tests are green again