better handling for fills