A few more math functions replaced