Update spec, still unfinished