Removed Warnings from David's Code