Make it more in line with the tv show