A few more function changes