debuging new stuff. See last commit