continued fixing fill functions