Non stratified still not working. Getting closer.