Update

Hopefully this will update my fork with Kara's changes.