Some changes.... error correction etc...