Revert "Revert "Relearse v1""

This reverts commit 21872b9b1c4d1723d5b049a8e571695eda710e81.