Redid some problems