Readd some functions