Updated some methods, preparing for big change