Some changes for simplicity