merge puffy's update