changed execution order