added form checks