reorganized method order -- too nitpicky