Completed a number of methods