DEP: minor changes
DEP: Alternative scheme