now neater, and with fewer crashes!