Waaay better than the first run, but there is still room for improvements