Finished v1.7