Version 2.1 based on feasibility report

Summary
Version 2.1 based on feasibility report