Added radar, minimal changes