fix this up for the new architecture