* Some polishing