Some changes that will be merged while testing