I already commented on this method last time. Please address my old comments first (or reply to them if you think they are invalid). Let me know when you are done and I will continue the review.