revert last changes.
Reverting all recent changes. Changes were made for testing purposes