Completed Version 1.7