Modified template ot have the proper fields pulled form json