Suraj || refactored.
Suraj || handles if no local submission present.