Temporary Changes That Fixes Some Issues w/ JMD