added some (atm useless) code