icon method added and raw method removed.