Another pull from WP-Nebula with heavy modifications.