Updated Working Project