Added even more functions