Updated Working Model