small changes for DEP-2, DEP-3