tweaked slightly the order we do things