Updated 1.1.7 Version