FIXING SCHWENDIS BUGS