Updated to reflect most recent changes in functions.php