some work on new archi