update from dorimanx