final update from me. yay