Added yet more functions.