Added depth constants and also pulled Mark's changes