Finished Version after a long hiatus