rearrange some calls, add wait screen