EA: some improve