Polishing for 1.5 version