added edited main