Shawna's Fixes!