Update with changes from LD29