updated A LOT