More Detaileed changes in this version. Easier to track and manage.