Update for cutting edge RAF