modified to make easier installation with WP