Added 5 funcs for 3.5