slowly fixin last 2 euqesitons