Shannon - last changes before updating for server run