updated to work without acf