Revert "fbjnbdfbl;"

This reverts commit c1e537ee6cd3049d1005f06f451d08fd4b97a837.
First 2 tasks

4A, 3C,