attempting to sort out some ordering issues