add edx, change some types