Updating to support -k flag