better than the previous, but could still use some work