Revert "fixed functions"

This reverts commit d78891c4db37f75c538d77f80632e7b88999ff0d.