Uglier, but I just want it to work!