Added what we have from RC3