udpated for editor