redesigned pretty much everything