Almost working, but ugly again.