Some changes for bla