Added --fill option