Moving a few things around for clarity