merged flaring sun vis, removed the 6 others for now