corrections randy done in marco's part