moved rva related code to another file