rewrite some specs