Convert #654244 to NCS