Ongoing changes, as its been a while since update