updated design
mid way merge
changes by Deepak