last changes -casper