added lots of raw