UPDATE - v2.1+ for Nocturnal (WP)