Great additions for this class!