trying to reorder a few things...