split into 2.10 and 2.11 and add $ names bug