Final Working Commit