updated raw generator