These methods look a lot better, nice work.