updates for better approach & loading times