recompiled with forii-specific code removed