CE-297 Polishing code