move to new snippet format