Added more functions...