American Changes & added new class err messages