Spec improved but needs work later.