merged with Dejing's revisions