passing to 1.7 and adding tags that misteriously disappeared