added several more class functions