bigger map + optimisations