Added force option