Changes based on R9F