Implemented fill selection