just fixed the last few methods