Updated to Etyllica 1.7