diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index 27f963c1..9c46a8eb 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -43,7 +43,21 @@ CHECKTEMP(){
 	if [ "${temptype}" != "sensors" ]; then
 		for ESXIHOST in "${PW_ALLHOSTS[@]}"; do
 			if [ ! -f ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${ESXIHOST}]}.down ] && ([ "${search}" == "" ] || [[ "${PW_ESXI_HOST_NAMES[${ESXIHOST}],,}" = *"${search,,}"* ]]); then
-				 GET_HOST_FANSPEED ${ESXIHOST} ${cdt} &
+				# GET_HOST_FANSPEED ${ESXIHOST} ${cdt} &
+			 	if [ ! -f ${PW_TMPFOLDER}/.lastfancheck/${PW_ESXI_HOST_NAMES[${1}]} ] || [ ! -f ${PW_TMPFOLDER}/.lastfancheck/${PW_ESXI_HOST_NAMES[${1}]}.set ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.lastfancheck/${PW_ESXI_HOST_NAMES[${1}]})) -le 300 ]; then
+			 		if [ ! -f ${PW_TMPFOLDER}/.lastfancheck/${PW_ESXI_HOST_NAMES[${1}]}.set ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.lastfancheck/${PW_ESXI_HOST_NAMES[${1}]})) -lt $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.lastfancheck/${PW_ESXI_HOST_NAMES[${1}]}.set)) ]; then
+			 			FanSpeed=$(cat ${PW_TMPFOLDER}/.lastfancheck/${PW_ESXI_HOST_NAMES[${1}]})
+			 		else
+			 			FanSpeed=$(cat ${PW_TMPFOLDER}/.lastfancheck/${PW_ESXI_HOST_NAMES[${1}]}.set)
+			 		fi
+			 	else
+			 		vHOSTFAN=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_RACADM_ACCESS} racadm -r ${PW_HOST_IDRACS[${PW_ESXI_HOST_NAMES[${1}]}]} -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep "System Board Fan3" 2>&1)
+			 		if [ "$(echo ${vHOSTFAN} | awk '/ / {print $4}' | sed -e 's/%//g')" == "RPM" ]; then
+			 			FanSpeed=$(echo ${vHOSTFAN} | awk '/ / {print $9}' | sed -e 's/%//g')
+			 		else
+			 			FanSpeed=$(echo ${vHOSTFAN} | awk '/ / {print $8}' | sed -e 's/%//g')
+			 		fi
+			 	fi
 			fi
 		done
 		[ "${PW_DEFAULT_ESXI_FANSPEED}" != "" ] && DEFAULT_ESXI_FANSPEED=${PW_DEFAULT_ESXI_FANSPEED} || DEFAULT_ESXI_FANSPEED=30