radial poc and More cleanup / optimizing effort