A couple more functions and comments