First stab at improving wrappability