Updated the Frew code again