Rework to new Spec

Works