still pretty ugly, but more stable than before!