Many changes mainly involving Alax