Revert "Small changes2"

This reverts commit 249ffde45bf005b48865f065926eedffdb223438.