Theo:some minor changes