Added 2 more functions