think I finally have stuff less ugly now