droid and WP additions