updates from eviloctopus