rearrange for better loading in the app