Updated a forgotten method and fixed missing function