Polishing first two chapters