Works better (but really ugly)