fixed kristoffers mess