new code
Merge https://github.com/jdis24/jrd_code