Fixed required functions