Update to 93 + new idea