Updated from current newapi