This commit finishes adding depth mode that was reverted before due to
other unresolved issues.