Cleaned, added force flag