Rework & Added Details

Rework & Added Details