DOH
Fix specs and about to reimplement on client