Revert "made changes based on data from merge"

This reverts commit 48c8a94773a76dfdb18d86a9fd7cc1505b9911fe.
Revert "Revert "made changes based on data from merge""

This reverts commit e6cba9096fce337b9de69a3f18195118884e1a75.