Updated to handle hyphen
Removed Euler22