More CleanUp to add back features halo broke -.-