added new wp-functions
merge timber.php