integrated steve's code with jessica's code