made less ugly