Add warn and new location