Finalize Part 4
REfine Part 2.1