Took out group function in rendering