removed unnecessary boolean