cpancake's changes