More updates from buffy