Changes made by Janko to make Aida work.