Renamed functions. Works fine.
tests work fine now
updates