WIP, updates specs