Some changes to aidaros project