moved fields to the bottom for easier code viewing and out of preference