WIP, udpate specs