Updated to Nake v2