updated for rc5