update
wip crashing somewhere