improved second map