New version with better executable