a LOT better now