fixes + new delegate method