Rearranged and increased verbosity.