updated r3 to match my branch

This is now the ONLY accurate branch