Added 2 more Functions