WIP - restoring the old spec, make sure that works