Adjustments made so application will still work with newest version of framework