diff --git a/docs/_images/2021-04-07_software_plan.png b/docs/_images/2021-04-07_software_plan.png
deleted file mode 100644
index c4e21dad44e2cd37fc89682eebfb6a275d2412e4..0000000000000000000000000000000000000000
Binary files a/docs/_images/2021-04-07_software_plan.png and /dev/null differ
diff --git a/docs/_images/athena_software_collage.png b/docs/_images/athena_software_collage.png
new file mode 100644
index 0000000000000000000000000000000000000000..665e1e7d389514d046afa08124168e0ae9c687e5
Binary files /dev/null and b/docs/_images/athena_software_collage.png differ
diff --git a/docs/_images/athena_stack.png b/docs/_images/athena_stack.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef35a8617f674cee34466c722b68f0a6b8b0e074
Binary files /dev/null and b/docs/_images/athena_stack.png differ
diff --git a/docs/overview/plan.rst b/docs/overview/plan.rst
index 3b4592d8f3b980b9703a45e04eeee9e827c7891d..17d57303ad6889017ffa356bf3fb881d5b1ddbec 100644
--- a/docs/overview/plan.rst
+++ b/docs/overview/plan.rst
@@ -1,47 +1,27 @@
 ATHENA Software Plan
 ====================
 
-.. figure:: ../_images/2021-04-07_software_plan.png
+.. figure:: ../_images/athena_software_collage.png
    :alt: Software plan
    :width: 800
 
-**Preparing for the future at EIC** 
 
-To ensure the long-term success of the ATHENA collaboration the aim is to build forward looking team of software developers. 
-Old solutions (such as EicRoot or Fun4All) should go - computing paradigms are changing quickly! In order to attract capable new software 
-development workforce we will focus on modern scientific computing practices. At the same time we should avoid “not-invented-here syndrome”. 
-Leverage modern, supported by large communities (like CERN) software components where possible to build upon mature, well supported, 
-and actively developed software stack to hit the ground running. The plan is to actively work with the EICUG SWG also. 
+Philosophy
+----------
 
-**Immediate concern: successful (best!) detector proposal**
+**Let’s prepare for our future at the EIC!**
 
-As the main goal of ATHENA collaboration is to present successful (and the best!) detector proposal, we understand that there should be no disruption 
-of WG simulation process after the DWGs and PGWs are formed. Previously WGs already invested their time into various simulation software and 
-advanced with the simulations. Any change to their workflows at this stage would be damaging. Premature rollout of new toolkit could take focus 
-away from crucial technology development and down-select that needs to happen these next months. 
+Software and computing will be critical to the success of any EIC experiment. Our strategy to acomplish this and ensure the long-term success is by building a forward-looking team of developers. We focus on modern scientific computing practices: modularity, orthogonal components designed for performance in heterogeneous computing environments. Our emphasis is on modern development practices built around continuous-integration, reproducible containerization and automated tests and benchmarks. At the same time, we try to choose mature, well-supported, and actively developed software components allowing us to focus our resources on those parts of the toolkit requiring custom development work.
 
-We will deliver the new software in parallel: implement subsystems in new software toolkit to prepare for full simulation & reconstruction of a 
-realistic candidate detector by early June 2021. DWG member can act as consultant to software group with minimal overhead
+Summarizing: 
 
-**Resources and support**
+- Build forward-looking team of developers to ensure the long-term success of the EIC scientific program in software & computing.
+- Focus on modern scientific computing practices
+   - Strong emphasis on modular orthogonal tools
+   - Integration with HTC/HPC, CI workflows, and enable use of data-science toolkits
+- Avoid “not-invented-here” syndrome, and instead leverage cutting-edge CERN-supported software components where possible
+- Build on top of mature, well-supported, and actively developed software stack.
+- Externalize support burden where possiblе
+- Actively work with the EICUG SWG to help develop and integrate community tools for all collaborations.
 
-ATHENA SWG will provide:
 
-- Active support for fun4all and other legacy tools throughout the coming year
-- Computing resources available at large range of facilities (BNL/SDCC, JLab, Argonne LCRC, OSG, …).
-- Distributed data storage over all facilities: Rucio (to be rolled out ASAP)
-- Git repositories and continuous-integration support available on the eicweb server
-- Documentation of resources and tools a top priority
-
-**Day 0 software**
-
-Currently as the new software is being prepared, the suggested packages to do full and fast simulations: 
-
-- Fast simulation: 
-   - Delphes
-   - Eic-Smear
-- Full simulation:
-   - ESCalate
-   - Fun4All
-
-It is explained in the detailes further.