Reformatted for detail rebase