first modification on insafork by elias