Add 2 more functions