again, trying to get it all in order