fixed up r-t7 a bit