Revert "combination of 3 commits by task650 ty bud"

This reverts commit a01e361d59abd359da6ac49d89c95f8d952acbc3.