editted to keep merged aida file