Revision of Deva class