Updated To Meet All Requirements