Some changes in WP5. Still working on it.