Polish/Refinement for apps
merge