rf: changed some things