moving things around for clarity