Modify code, process more efficient