updated after spec