added switch to ignore lock