reworked to be much, much, much prettier