WIP improving specs.