Updated to jennys newest code