Update from etyllica 3.6