Ildipo/performance

wait to merge that we finish release 1.1.1