WIP, mainly vertical update