moved r6 stuff into r3.c/h
moved r6 stuff into r3.c/h