Completed Version 1.8