Polished for final 1.5 build