mistypo and logic updated