Added more to the methods