some restructuring + helix fix