[Anton] Fix + added benchmark code