Changed functions to binaries