WIP, update not working yet