moved things around to make build better