Added more functions (not yet done).