Updated from latest run through