Changes after PR-3 DDBasic