Added 2 missing functions