Added --force option