v3.7 -> some things added