minor modifications, add submission stub