Made several changes including streamlining of multilple forms