NeoComplete once again + attempting extra portability