Couple more functions done