quick update to remove the infinate loop