changed fields and reordered method calls