commit for changes proposed by Kasper