* merged changes from the conference