works without themeengineplugin and improved performance