*fixed 1d topology
*added 2d topology