Recompiled to removed anon functions