added extra message and handling for wrench