Merged Roy's changes and removed R3F.