Now with outside bounding edges, also using map that works