Moving things around for clarity