fixed some of the methods in Q3