progress...
much better