removed unnecessary times
merging wendys code