Updated prototype to be in line with Dave's updates