Some changes. COntinue to check