Be more dynamic when filling.