some stuff for the new architecture