Updated to etyllica 3.6