updated modesl and forms