Rewrite filling functions