update from web and dirk's server