Dana Fixes/Additions