removed WP modification to get cleaner code