Added more functions again!