Updated Exercise for better unit handling.