more stuff
Revert "more stuff"

This reverts commit 320b2685aed4f5617954fec7ae4ac44050f19591.
improved functions